wip: adding byproducts support