added check for storeable type