Adapted to newest libs
Adapted to newest libs