Added datatypes etc.