Made all behaviors and a few more class internal