Moved to separate class object