*8197* Moved ONIX stuff to application