Major refactorings and improvements
Article added