Do we need this change? Won't the original implementation work for both orms?