Updated identity plugin