Added more core elements for the Engine