Added support to others elements