Refactor builder intefaces.