cursor support
abstract mapper fix