Added database structure and service