Massive database structure changes. Also, handlers cleaned more.