Changed the import approach