Adding Lion functionality