simplified maintenance and notification handling with new data structures