Add element type handling