Add doc blocks hand more handlers