Changed to non parameterized class space