Removed deprecated stuff and add more detais for handlers block