Removed UUID, moved BitSet