Added partial code for import