Changed some methods to properties