Decision attributes refactor