Updates for more versatile usage.