Implemented new, more flexible behaviors API