More work on Match class