Refactored. Moved this class.