Core service (16/23)

Core service