Damn, how could I miss this? Any PR's are highly appreciated. :+1: