Adding support for more weather types