Added States and WindowManager