Added changes to WithSubject