[BD]Refactor