added mapping for imports and commenting code