Comment/WebService updates to new  schema