Small changes to class