Made TOs serializable to get them working
Fixed NPE in Ctrl