Updates for generic usage