Better code structure / worker side commands