Common updated to allow reuse on slave