Added DB solution