Changed to always accessors for consistency