Hotfixes - added define-all.hive