Added place holders for events listener and did some name refactoring.