REFACTORING: move out backward compatibility fixes in builder to hook module