Added event/control scheme system