Added Subject and some more changes