Add client templates and property types