Adding empty entities disabled for now.