It might be worth resolving this issue. Maybe put these in another module? Maybe in utils?