Fix support for 2.0 (attribute access)