Improvements to function of annotation and modeling commands