Add record provider
Fix crashes