Add passing improvements