Added some content and mappings