This is changing to decorator properties anyways