Fix with class names, add getAll