Changed magic strings to enums