Refactor Entity in BEM: