Started to add support for parent-child storage
Prepared for phrases