Adding event system and queue