Mapping changes and added behaviors for future work.