Changing the data model to seperate out MemberVO and CapturedLocation