Removing sqlite dependency