Add multi-version support