Add a few more necessary imports