Make the usage more generic