Feat/configuration