Updated imports and vars