Imrpoved doctrine support