Changed to current way of handing imports, added handler for userControlled.