Add annotations and fixes for workers