[DEV] update new archi