FEATURE: CL-6267 Added support for definitions in simple execution resource