Updated implementation for services providing data to app