Ditched Parameter wrapper class and improved Method match method instead.