Added basic core data functionality