Improve the common and PostgreSQL roles