Adding support for if exists