Remember player metadata
Restore non-renderer check