Updated types, added unions of bits