Add fields to Work Queue

This is not a trivial task unfortunately. Here is a similar thread: