Feature/new lib