Add delete support. Add load catalog support.