REFACTOR More specific events calls to accessors