Which matches the changes done in neo-storm and also make this codebase closer to the `dev` branch (that also uses Instruction).