Refactor master request runtime