Added Content Element; more improvements