Add a dependency and some modifications to main lib