Add composite binary store support to EAP