simplify build data store