refactored providers, improved relation rendering