Removed Booleans and added Data types