added some mappedBy attributes