Bring properties attributes inline with upstream