Changed object types/names to be more generic