Added underlying database features for M8