Updated worker and logger code