Merge "Move database constants to their own file"