Added update scaffold and logic