fixing database usage
link to last modules libraries (not duplicates files)
update for new catalog module