Added check for contains with id