Mvp fixes

maybe rename to entity_attrs