Removed workspace
Migrated to longer datatypes