Replace closure with LazyServiceListener