Tidy the config and add PaypointOptionsInterface