Refactored to make room for more builders and publishers