Handling undefined provider and refactoring to comply to new bono specs