Completed utilities for all classes, added account for data type