Added gets and sets