Bug fixes and handling the element definitions in the BasicV2 type
better.