Updated import references