Improved the way to configure the definitions.