Moved CLI bootstrap