Added support for Subject attribute