base mapper logic is added