Fixed Enums and Changed weather package