Update functions and file names, added IterateObjects