update do new Sugar* architecture