Complete most of the mapping. Apart from cart and order which require fix