Fix get methods and template creation