Tweaking template for development and fixing time issues with API changes