Changed some templates and added a property method