OPEN - issue VISCAT-194: Add support for new tables 
http://jira.jettmarks.com/jira/browse/VISCAT-194