Updated UserSource plugin framework