Whole service was extracted to a package