Added Database and core data stuff