Add standalone version for non-component