Changed getters to properties.