Adding Field mapper as a trait.
Media is now linked as a separate resource.