Removed final and static properties. Added non-arg constructors.