Added static mappings