Changed a few methods into properties