Reworked custom configuration approach