Added possibility to analyse alternative databases