More work on command execute plugin