Changed to wrapped types to allow nulls internally
Added memory heap implementation of store-api