API updates (restrictions/machine/parser)