Move functionality to work package service