Better design for awesome events and bugfix