Taking care of API backwards compatibility