Updated library contains "namespace" changes to prevent some possible conflicts