Made the project upgrade-friendly