[BUGFIX] add forgotten classes