Added mvc and health support