Minor refactoring of work packages api