Moved to separate class