Added Container, Event, Kernel and Service classes