Switch to state property instead of getter