Update to more generic module