Add optional mapper support to relations