Moved templates into inheritence