[ISSUE-2] Bundle structure