Added new classess and mapping