Modify constructor to be noargs