Added some EAV helpers