Update for relative import scheme