Bf/mapper

API Mapper baby!
object.type doesn't exist... :) object.data.type does...