Redefined how Waiting on and Deferred projects are defined.