Refactoring and added markdown engines