Moved catalog and schema out from the constructor