Removed duplicated line
Added experimental support for associations