Handlers and config improvments
State saving improve