Adding data structure classes