Enhance elements support