Restruct catalogs scheme.
Correct add unit working