improved core data helpers; handle id free entities appropriate;