Modified controller and data handler for multiple matche creation.