Improve delegation functionality.
Fix error with user location mutation.