Issue 135

This pull request addresses issue #135 - 'Convert some configurations to Xpath"

Team L2B3