Feature/configurations