Relecture Advanced/Database/*
Merge pull request #137 from eguaj/3.2-relecture-advanced-database

Relecture Advanced/Database/*