Updated
Switched to generic handler implementation