Modify to use defined constructor