Any reason we are adding this class?