Basic event and collection classes added