Update order of constructor