Fixed Event name being null
Updated to receive new optimizations