Updated CommandFactory Slightly