Moved most of the mapping logic to the cf service.
Merge remote-tracking branch 'origin/kratos' into kratos