Added generic template definitions and new point structure.