Added all the mapping logic (CRUD)