Small Weather DAO refactoring