New user extractor, master improvements added