Databuild updates, refactoring