Configurable intervals, ordered state dictionary, better error handling