Added stop handling
Added config lookup