- Added Guard and Bootstrap support