Adding some missing imports