Group rework

Templates