Add optional class for separate developing and testing.