Update to better mapping handling