Always be careful when refactoring and updating API's :D