Added fast-render support