Feature/extra settings