Begin backwards compatability with API changes