Added additional projects
Markup refactoring