Future changes to @-attributes