Added support for paragraph tags