Add ListProperty and MapProperty support