Events fixed. And renamed main extension to be more Domain orientated