Core service (18/23)

Core service