Should this perhaps be submitted to the masterfiles repository?