Improve eleveldb support