Modified: Array/Object mapping classes.