Complete support for Hazy builder