#6 Terms basic support added