refactor CoronaBuilder API