Remove old unused data types
Add all new necessary data types