Added existence check