Added support for a target of _self