Enhances sensor handling

Modified scenario handler and scheduler