Add full nesting support