ModelUtils extended with enum utils and moved to separate package