Updated to non static attributes.