[DEV] update to the new architecture