Adding import, removing User