Added support for companies/events
fixed support for events