Update constructor some more