Updated to remove sql dependency