Update to be more generic