Update to constructor