Changed constructor to use setters