Add return type to Match function signatures