Updated class location