Updated imports and javadoc