Added  mapper classes
Changed variables to correct data types and added empty constructors