Bootstrap is added and some other refactor