Updated after adding DB command