Refactor enable components for my report