Fixed libraries imports