updating with new class definitions from informacam lib