Updated engine + Entity factory changes