Refactoring. Added class in all unions.