Resolved TODO in BitStream