Better imports and tuple support