Added the x-catalog header and re-organized