Pass definition information with init
Remove special cased logging