Added some stuff to interact with upcoming AI