Restructured and new schemas added