Refactoring, adapted to newest libs