Retool the embedded User system with the improved extendability.