Improved OSIS and some other imports