CHANGED: Core - Using new macros for declaring and defining event listeners.