Removed dependency on sqlite