Add compability with: