Started extracting lengthy lambdas into invocation classes
Added alternative constructor for Definition