A few TODOs implemented in MatchType and User