Changed field name
Added awaitTermination for compatibility with 1.0