Improve interactive mappings