Feature/configuration