Core service (22/23)

Core service