namespaced private plugins functions and updated deprecated function usage