Added proper uarg handling