Updated Mapping configurations