Fixed import definitions and modified comments