Updates for enum scoping, add a method