Replaced hard-coded items with plist