Better nesting support