Add initial lib support