Added a macro dispatch feature to OneOf