Update to be more friendly mapping