Added a type called ClassField instead of using raw bitmasks