Updates to RAD template