Split out core and objects from main, Added event