Implement a moulinette lock and revisit extra params a bit