Revised and re-organized handler classes