expanding for use outside hive-mvc.