Simplify a bit data handling and increase coverage