Moved DB logic to catalog class