further changes to v3 template to move constants