Added element check