Constructor options changed to constants