Improve nested entries