Updated general.databases parsing