Templates and DataTypes

Moved Templates and DataTypes to the new API. in v7.0.2