Less method indirections
Add support for bootstrap