Feature/lib