More work on relationships, specially core data parsing