Added better HMVC Handling