Feature/library integration