Add lib + add proxy support