Finished refactor or registration using DataBuilders