Updates after cloning Anax-base to Anax-MVC