New classes to remove class complexity in other classes