Refactor for AllediaBuilder