Changed Utility to enum to Class