Clearer support definition
Allow default #storage to be defined with being overridden