Hi, about "Add query source to generated SQL" parameter, the ideal would be to include the comment after the "select" clause. Example: select /* espace.serveraction.name */ * from ... So the DBA would know directly in the database from where the query is being executed. The current version puts the comment before select. Exemple: /* espace.serveraction.name */ select * from ... I use Oracle and it would work well. what do you think?