Added backwards compability