Mavenish structure and some other changes