Moved to db specific package