Removed hardcoded Attribute

| Q                   | A
| ------------------- | ---
| Bug fix?            | Yes
| New feature?        | No
| BC breaks?          | No
| Tests pass?         | Yes
| Scenarios pass?     | Yes
| Checkstyle issues?  | Yes
| Changelog updated?  | Yes
| Fixed tickets       |
| Doc PR              |

To merge with the 1.0 branch.