Changed class location