Again prefix changes & first templates