Change VP encoding and remove standalone "state" command