Updated to use auto-generated version