Core data functionality added