Updated to support execution by definition call or by overriding attributes