change to nested entities