Adds more extensive templates

What do you think about this @yakky?