Add basic mapping
Add LocatorNotFoundException