Introduced new configuration pattern