Added more entities and mapped relations