Better event coverage

Created by: dzaporozhets