Tables rebuild + mapping table added