Feature/upgrade viceroy context