Added bitfield handling