Still fixing entity initialization.