Added MVP support + general code cleanup