Add required imports back
Allow newer base versions