Removed behaviour directive and bit-type additions