began adding core data support