Added additional indicators and their respective buiders