Fix EF generation conflict
Added new attributes (p_id, h_id, church, employer, occupation, school)