Note: there are no tests for now since I'm not 100% sure it worth the effort (or if this MR is worth merging)