Moving to separate class