Deriver support

In this patch, I changed the handling of definitions and renamed some variables to make the code a bit clearer.

Thanks for update the issue. If we want to get it in it needs a merge request so the test pipelines run + needs tests of it's own added.

Thanks!