Fixed accessors, and added accessor defining within the constructor