Update mapper and code to deal with nested beans and use NameUsageContainer for extension data