Converted bitfield to it's on class