Updated bootstrap and made classes extendable