Began adding static mappings