New catalog implementation