Add pool and fix cassandra storage