Adapting to the new com. method. Updating databases.
Database system updated. Now it's supposed to be simpler than the original.
Merge branch 'master' into dev-com
Updated with changes in master