Removed hard-coded conditions pointing to SampleApp, fixed JsonWrapper issues