Feature/express upgrade