Core service (17/23)

Core service