[data] add basics without logic
[builder] setup cleanup