DAO + library + structure updates