Updated to the latest HMVC