Updated to avoid name collisions