Modified to work with new bootstrap mechanism and namespacing