Removed all enum specific utility methods and replaced them with generic
methods