refactor: Improved decorator accessors to use common logic.