Add support for terms
Updated report comments and improvements