Modified class for testing