enhancement on command runner file