OCD: changed property order
Updated dependencies to latest version