Add May/Many/MayMany support