[PR] Additional changes to WPCLI scripting