Added new version support