Reduce usage of unions