Updated sources and handled more events