Moved to generic user service plugin