Added check for existing object