Now I just hope I can marry this with compound values (next PR in queue) ...