Add lib support