Feature/extended configuration

Yeah, maybe later.