- Added more Type of elements