GH54 - Implement expand nodes after create