ZER - Some major refactoring