Refactor storable attributes out of storable