Making eav model more consistant.