updated to include db options