Further functions moved to class