Simplify build by introducing queuing function