make build more generic