Improve usability of instance/mapper