Refactored for Database expressions to share base