Refactored architecture6 resolve #3