Remove the need to specify target class

Rebase