refactor subfile code
Merge branch 'hotfix/1.1.0'