Made upload target more friendly