Fix main library and it apply to add