[ARCH] 'DAO infrastracture minor improvements'