Added titles and name field for current component