Allow use of derived classes and add missing argument