Fixed maping issues