adding support project and fix change state problem