Continue work on HMVC implementation