Added originator and various fixes