Add support for Target class