Added dose attribute to be pulled from VQ attributes. Some code clean up.