added some refactoring for db artifact and some gradle updates