brick data refactoring