Added DB saving