Feature/mode management