Added some logic to help with single smaple requests and label options