Started using the accessor in more places