Added comments to IndexHandler non-basecase