TOLEDO framework changes