Add more core data stuff