Change structure and refactor codes for individual access