added db storage support