Reduce reliance on scriptlets