Added custom support for EAV models