added mappers and entities classes