[Improved] Service implementation