More vagrant related mappings