- Did some refactoring (Application Preference attributes)