Modification for Spout command handler change.