A couple of minor adjustments
Implemented Element::Base.find!