added extracted core data stuffs