Updated template to allow flexible property names