Updated to use dynamic version