Refactor for Bit 0.8.1