Some major refactoring regarding template extension and built in functions.