Core service (20/23)

Core service