Fixed bug, added new sql setup for DB