store created instances on initialization
Merge branch 'store-instances-instead-of-data' into custom