Added required imports and removed superfluous Enum suffixes