Feature/extended configuration

Should I create an issue, or will you?