Split to more classes