Updated to new signature, put work in service