Changed methods to properties