[Subhas/Faris] Added mappings except photo and separation history