Plist refactoring