Changed some methods to properties (backport from students branch)