Added remaining mapping