Import a few package that were missing due to the refactor