Add database storage and fix CRs