Added static weaving