Added support for public targets
Support passing of username or ID