Updates to avoid exception of not supported op on SQL