Split into two classes