Changes to class name
Added post match to force working with user module