(v1.2.2) Improved flexibility between element types