Changed the datatypes to non createable classes