added some refactoring for db artifact