Making copyright more 'catch all'