Add a generic mapper
Fix angular trust problem