Use proper accessors