modified implementations to include db