Avoid deep level nested resources and add comments