Removed very magic search, added mappings