Moved prospect to Class based