Move hive stuff into job