Updated references and various fixes on user types
Updated version and references