Add some utils for CDB