Fixed storage

Fixed nested behavior implementation