Converted to an enum rather than static ints