Refactored imports to allow the library to be declared Safe.