Made progress in mapping implementation