Modularize worker