Bugfix
Paragraph type plus refactoring