Few more updates in workspace xmls