Adapted import statements to fix compilation for new 3.0.0-SNAPSHOT versions.