Enhancement: split build