Fixing BaseModelTemplate