Started WHSuite modifications