OPAL-1910: Removing TODO
OPAL-1910: Fixing warnings for overly long method
OPAL-1910: Using @GenEvent to generate boiler plate code
OPAL-1910: Using @GenEvent