[3.9][WIP] Add configuration storage