added core data and also property list