Address issues with delegation. Add consistent chaining