Feature/make upgrade easier