adding mapping rest of tables 2