Conform to cli req