Changed to use a single plist file