Feature/improved settings handling