Changed handler declaration in service