Add ResponseBuilder, cleanup