add mapping controller and add mapping store
fix previous commit