Enum added, and moved to separate package