Changes to work with RemoteTK