Moved initialization to Engine