refactor(fieldMap): separate data service

from entire datacontext