Updated generateUpdate and setup.class to improve reusability in system.