Fixed label issue and externalized hardcoding issues

Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com>