Added remaining non-player characters