Huge migration to Spring MVC commit :)