HMVC improvements