Refactor Questions Feature to be declarative