Adjust namespace
Simplify bootstrap