Added JavaDoc and enhanced imports.