Correct hierarchy, add sample placeholder for element mapping