__Expandable__ attribute added