Added more bits into the framework