MYLOC-59 - Add more events