Updated and add lib