Changed class usage