Add full support for external library