Removed aggreator, implemented in dataAccess
Added marital status support