refactored cursor mappers