Moved method to separate class