Updates, improves, add onException for bootstrap