Adds backward compability and tests