Updates to Componet structure
Added window