Add May/Many/mayMany support