Oops
Add extra libs support