Add nested entites and build fields dynamically based on annotations