Greatly extend supported element types