Added dynamic version support