Removed dependency on postgres