Implementing workarround for cli commands