Added ability to return row if already exists in the db