Updated to include db allocation