Added initial event handling for cells