optimize MenuplanBuilder and Datasource