Allow icicle onSave and onLoad
Add OptionalFilter.class and Optional.class