Changed it to be compliant with CLI