finally clean solution for custom configurations