Make entity attributes visible in statement part. Issue #39