Add Weather types
Refactor MainParser