Fully converted to storing bitfields only