added more data, new templates and helper functions