Added database solution