Replaced some methods with properties