- NPE fix
- Using more constants
i18n