Can we do it without adding this class?