Improved array key
Duplicated package/feature protection
Small refactoring