Added revised import declarations.
merged master