Extended the bean XML definition to support Maps and List

Mark, please review this code