Cleaned up data types
Merge branch 'New-Feature-X'