Adapted to newest ssvj
Adapted to newest libs