Further tweaks to user import class