Reworked build API response